am 6410c8c4: Merge "Use black for blackout layer" into klp-dev

* commit '6410c8c4097f1a3246aa3d03b3291d47f982bc4b':
  Use black for blackout layer