Merge "Add more shadow control knobs"