Merge "Do not setListener(null) onViewDetached" into sc-dev