Merge "Directly focus button in touchmode coretests" into oc-dev