Merge "Restart after flag changes on screen off." into tm-qpr-dev