Merge "Unfilled shapes should not report themselves as opaque" into lmp-dev