Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev
am: 37af93ad1c

Change-Id: I92254792b7681d1be53849ad3847dbb4e5318139