Merge "Adjusting margins and paddings for portrait shade on large screens" into tm-dev