Merge "Allapps layout polishes" into sc-dev