Merge "Finish updating cast icons to material" into lmp-mr1-dev