Merge "Update app ring color and alpha" into udc-dev