Merge "AOD lock icons should always be white" into sc-v2-dev