Merge "Dump lock screen setting" into main