Merge "Fix disappearing BACK button."