Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev