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