am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev

* commit '18709f9a0095afe6dba11f9dd71e3210c5f4e1db':
  Relax strict ActionMode instance checking when finishing action modes