Merge "Restore the correct state of the statusbar, navbar, and keygaurd after an density change"