Merge "Fix NavigationBar overlapping with the IME window" into sc-dev