Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev