Merge "Helper methods for settings screen" into pi-dev
am: 6a66f4e8cf

Change-Id: I7c82e16f2c1004114484bc422afe47cb894ca3a3