Merge "Refine the homepage app bar layout" into tm-dev