Merge "Add extra logging for SysUI's userUnlocked cache" into main