Merge "app: move appdomain to public policy"