Merge "Revert "always adjust per-user application info"" into oc-dev