am 45756ec5: am 86234afe: am 19dd44c2: am 5e078458: am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev

* commit '45756ec5ab3c59152464f63a0cbe4566ebf4fa32':
  Relax strict ActionMode instance checking when finishing action modes