Merge "Add feature flag for new keyguard dismiss refactor" into udc-dev