Merge "Fix constant crash when setting MultiStateCallback.DEBUG_STATES=true" into tm-qpr-dev