Merge "Add policies and enforce overlayable to header" into rvc-dev