Merge "Wire up change listener for leanback preference dialogs" into mnc-ub-dev