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

* commit '0699350336cccc244bb6c52a0d910f9599253812':
  only clear FB when asked for the opaque layer