Merge "Fix issues with view not switching using the pull-down menu"