Merge "Fixing bug where the widget background enters into a focused state if a child calls requestFocus in xml" into ub-launcher3-calgary