Merge "Display SIM PIN immediately when inserted on unlocked lockscreen" into main