Merge "Only consider parent windowing mode if activity has no mode override" into main