Merge "setVisibility should not propagate focus on children views" into ub-launcher3-master