Merge "Update lockdown icon color" into pi-dev