Merge "Fix apps row align and update to new layout spec"