Merge "Improve the home and lock tabs transition" into sc-dev