Merge "Lock Work Profile immediately when user presses power button" into nyc-dev