Merge "Disable screen saver setting for non-system users." into tm-qpr-dev