Merge "Fix 3024522: Add "no lock screen" support to the framework."