Merge "Reset Keyguard when clicking emergency call button" into oc-dev