PreferenceActivity will now persist view hierarchy state properly. Change-Id: I4e7fe036d0d0bced78e58e2a15808facf502e449