Merge "Use black for blackout layer" into klp-dev