Merge "Fixed some issues with resuming already resumed activity" into nyc-dev
am: 37634aefb6

* commit '37634aefb6e32af696355bad859335fa00f14261':
  Fixed some issues with resuming already resumed activity

Change-Id: Ice47245280c6e4fe6314249b2718a1dffaa0e9be