Merge "Pass in navigation bar panel context created by task bar when taskbar navbar unification is on" into main