am 586256c8: am 327fee84: Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev

* commit '586256c891c25018b93bef15b8e8c610b281c624':
  MediaRouter: Prevent activity from restarting