Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev