Merge "Fix confirm lock UI theme." into nyc-mr1-dev