Merge "Recompute focus in showLw if needed" into oc-dev