Merge changes from topic "am-5fbe650234424ec0bd8c7dbdafcd7ac6"
* changes:
[automerger skipped] Merge "Make media squishy for portrait shade open and close" into tm-dev am: 362dcaab -s ours
[automerger skipped] Make media squishy for portrait shade open and close am: 3f2eea47 -s ours