Merge "Adjust padding in expanded portrait shade" into tm-dev