Unity System Compositor

Merge proposals dependent on lp://qastaging/~mterry/unity-system-compositor/inactivity-zero-fix

  1. inactivity-zero-fix
  2. Dependent merge proposals

lp://qastaging/~mterry/unity-system-compositor/inactivity-zero-fix has no merge proposals.