Merge "Fix ActionMode.snooze API" into mnc-dev