Merge "[taskbar/navbar unification] Do not shift back button after unlocking in phone mode" into main