Merge "Add a scrim to AllApps and Widgets" into tm-dev