Merge "Merge "Fix onPrepareActionMode() not being called" into nyc-dev am: 9412176 am: c202e17" into nyc-mr1-dev-plus-aosp