Merge "Override device lock pattern visibility when unifying" into nyc-dev