Merge "Don't crash during layout of non-attached but focused view" into pi-dev