Merge "Fix activities are not removed while removing the Display" into main