Merge "Fix lockdown icon dark mode coloring." into pi-dev