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