Merge "Move device policy flag definitions client side" into main