Merge "Fix policy for platform compat UI"