Merge "Improve handling of launching translucent occluding activities." into main