Merge "Ensure state transition of paused activity." am: c2b9c5388a
am: 11695e8081

* commit '11695e8081b269d489b5b4cc0b0c2075baeebc9b':
  Ensure state transition of paused activity.