Merge "Only allow TaskDisplayArea to specify orientation if it is focused"