Merge "Add method to cancel StatusBar touch" into oc-mr1-dev