Merge "Add a delay before turning the screen off" into stage-aosp-sc-ts-dev