Merge "Don't display UI when playback state is STATE_NONE" into pi-car-dev am: 3f8d61898a am: 8a5d841923 am: 384e727760 am: 2516714085
am: 4e7105370c

Change-Id: Ib7cf5ef06a33b04bc08e8ccf03ef355acd2c7042