Merge commit 'a54755962ca7725d1e2b6cacbbaece6f1cbf5af4' * commit 'a54755962ca7725d1e2b6cacbbaece6f1cbf5af4': Cleanup a bunch of warnings in app widgets code.