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