Merge "Update lockIconView to directly set the image drawable" into main