Merge "Check for isDeviceLocked in onDismissSucceeded" into oc-dev