Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev