Merge "Fix work profile screen timeout policy" into nyc-dev