Merge "Enable new shade features in AOSP" into sc-dev