Merge "PIP: Hide play/pause button by default" into nyc-mr1-dev am: 25796925d9
am: 28825f1af0

Change-Id: I488278956d22d53c08e1bd8ac1ff2d4978b7ddc5