Merge "Don't clear focus during transition animations" into pi-dev
am: 09ba7e0bae

Change-Id: I7243f32a7b5770f7e8ac64af329794101ac35c70