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

* commit 'af4ae923c3f8a2e40d74eb6291da16b4a6514449':
  Use black for blackout layer