QAART-45 Gallery/GalleryBuilderComponentObject.java and Photo/PhotoAddComponentObject.java after code review