Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev