Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev