Merge "Refactoring app widgets to address security/performance issues." into honeycomb