Merge "Remove Shade expansion FRP check" into main