Merge "API level 30 upgrade: PhotoTable"