Merge "Attemp to fix blank lockscreen #2."