Merge "Fix onPrepareActionMode() not being called" into nyc-dev