Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev