Merge "Set correct stashed task(nav) bar height with taskbar/navbar unification" into main