Merge "remove turn_screen_on flag after screen off" into mainline-prod