Revert "[automerger skipped] Merge "Revert "Make media squishy for portrait...

Revert "[automerger skipped] Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3 am: 0dd9f892 am: be0f9f70 am: ee086331 -s ours"

This reverts commit 74b57da4 by forcely cherry-pick change 18566290

Reason for revert: master diverges with tm-qpr-dev

Test: Manual

Change-Id: Ia075597e8286a4bac4075e693e169c0a0daeb4cd