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

Change-Id: I5b091f4fc17586a80934bbea0437323f794d6465