Merge "Restore nav bar position when wm size is reset."