Merge "Fix AA+ decorator drawing out of bounds issue / Make AA+ opaque" into sc-dev