Merge "ColorFade draw should not be called after PowerState stopped" into main