Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev