Merge "Update ACTION_PICK_IMAGES javadocs" into sc-mainline-prod