Merge changes I3f7c88ee,Ia5d85d3c,I34d26ddc,I0a64e2dc

* changes:
  Remove unused code (4/n)
  Pass "-g --user all" when installing apps (3/n)
  No need to switch users before running tests (2/n)
  Wait for rollback becomes available (1/n)