Merge "Hide [share] image_password from log"