Merge "Recompute focus in showLw if needed" into oc-dev
am: 49028f0199

Change-Id: I38f184fb96e62bce8c03239541b23f3db3649c90