Merge "Fix ManageApplications pinned header overlaps content" into sc-dev