Merge "Disable screen attention when DISALLOW_CONFIG_SCREEN_TIMEOUT"