Merge "Adding pan behavior on preference dialog."