Merge commit 'ba3ba57921dedaaef669719c0359c0caf60e008b' * commit 'ba3ba57921dedaaef669719c0359c0caf60e008b': * Use cached resources for widgets
Merge commit 'ba3ba57921dedaaef669719c0359c0caf60e008b' * commit 'ba3ba57921dedaaef669719c0359c0caf60e008b': * Use cached resources for widgets