Merge "Directly update the lock icon background color"