Merge "Make shade transparent under a flag"