Merge "Don't set keyguard state to showing when service disabled" into oc-dev