Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev