Merge "Backup SystemUI as system user" into tm-qpr-dev