Merge "Add master toggle to enable/disable screen savers" into tm-dev