Merge "Revert^2 "Update timings for the Home <> All Apps transition."" into tm-qpr-dev