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

* commit '327fee84b57a902ee35f2dd7c5d2c4e65f790aac':
  MediaRouter: Prevent activity from restarting