Merge "[automerger skipped] Merge "Add guts to media player on long press" into rvc-qpr-dev am: 994c26d0 am: 46c190f2 -s ours"