Merge "Don't display UI when playback state is STATE_NONE" into pi-car-dev