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

Change-Id: Iea6f1656939f3630cee634d0054167204faf6829