Merge "Merge "Add method to cancel StatusBar touch" into oc-mr1-dev am: d180d76305 am: a69bdd0a57"