Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev