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

Change-Id: Ib77e2cebb2c788adc74bc640eaa3cef7331663d4