Reviewed-by: anthony, leonidr

Reviewed-by: darcy, weijun

Summary: The restore-focus procedure should skip disabled components.
Reviewed-by: art, dcherepanov