Merge "Don't register multiple predraw listeners" into sc-v2-dev