Merge "Fixed the navigation bar placement on device restart." into main