Merge "Promotes screen timeout setting." into sc-dev