Merge "Make ActionButton.CloseMode look similar to Toolbar.Button.Navigation" into lmp-mr1-ub-dev