Merge "Revert "[automerger skipped] Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3fd am: 0dd9f89200 am: be0f9f70d4 am: ee0863315d -s ours""