Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev
am: ae938cee71

Change-Id: I0b0fe6f7cc07362e98f7a5a2b54aa66bbd5ffc7f