am 354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev

* commit '354b70f7d209e79e4442d4b70fb1d849163eae3d':
  Set non-starting visible resumed activity as resumed activity for the stack