Merge "Remove clipToOutline workaround for null backgrounds" into lmp-dev