Merge "Fixing all-apps appearing as blank" into sc-dev