Merge "Stop focusing views before layout." into oc-dr1-dev
am: a5dab05b61

Change-Id: I31f4ce541ac56887549a654b5e313e1f361152c3