Merge "Lockdown icon tint should adapt to light/dark theme." into pi-dev