Merge "Fix up-navigation for different levels of Settings screens." into jb-dev