Merge "Lockscreen changes font on Overlay change"