Merge "Fix potential memory leak by setting mControllers = null" into sc-v2-dev