Merge "[RESTRICT AUTOMERGE] add normal brightness controller config" into udc-qpr-dev