Merge "Fallback to old UI when DeadObjectException is thrown" into main