Merge "Replace ic_clear with vector icon" into lmp-mr1-dev