Merge "Merge "Stop focusing views before layout." into oc-dr1-dev am: a5dab05b61 am: 2436cb76b9" into oc-mr1-dev-plus-aosp
am: 88f3cb403e

Change-Id: I0ef52270bcb26add67892b6c9d64d010e9e8751b