Merge "Fix issue #6020164: Settings crashed on orientation change..." into jb-dev