Merge "Make Navbar Back Button UI Consistent with SysUI" into main