Merge "PIP: Implement play/pause button in menu" into nyc-dev