Merge "Add provisioning extra to keep screen on"