Merge "Fix inconsistent use of screenlock" into nyc-dev