Merge "Cutout Overlay: Flip color in inverted color mode" into pi-dev
am: aceee95fa0

Change-Id: Ic9374e3d3d753f0da8841229e16d5e2cee6f0271