Merge "Tablet/AllApps fixes."