Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev