Merge "Revert "Ensure SystemUI gets restarted lazily."" into tm-qpr-dev