Tomdroid

Merge proposals dependent on lp://staging/~pjv/tomdroid/fix-tomdroid-Android-lifecycle

  1. fix-tomdroid-Android-lifecycle
  2. Dependent merge proposals

lp://staging/~pjv/tomdroid/fix-tomdroid-Android-lifecycle has no merge proposals.