Merge "Revert the window context creation in NavigationBarController" into sc-v2-dev