Merge "Don't clear focus during transition animations" into pi-dev