Merge "Add icon_load_drawable_return_null_when_uri_decode_fails flag" into main