Merge "Add home controls button to screensaver settings" into tm-qpr-dev