Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev