Merge "Shell transitions not received when activity already open on another display" into main