Merge "Enable -Wshadow always" into integration