Merge "Helper methods for settings screen" into pi-dev