Merge "Missing resources for lock screen." into kraken