Merge "Fall-through for ActionModes with ToolbarActionBar" into lmp-dev