Merge "Revert "Add setting for device docked screen timeout."" into tm-dev