Merge "Fix layout problem in "All apps" view" into sc-v2-dev