Merge "Update udfps icon alpha after bouncer vis changes" into sc-dev