Merge "Set mBrightness when needsComposite is zero" into tm-qpr-dev