Merge "Add setting for device docked screen timeout."