Merge "Update dirty-image-objects am: 4c7291f76c" into qt-dev-plus-aosp