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

Change-Id: If2bbb15d9609260272d74e3fc8c7de7c9789fa2d