Merge "Move getMaxSupportedRealUsers() to App layer"