Merge "Choose TDA by DisplayAreaPolicy for WindowContext"