Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev