Merge "Update brightness icon to rounded one" into oc-dr1-dev