Merge "Fix screen not turning off correctly." into sc-dev