Merge "Update light reveal + udfps icon vis" into sc-dev