Merge "only clear FB when asked for the opaque layer" into klp-dev