Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev