Merge "fix SOX in clearFocus" into honeycomb