Merge "Revert "Remove system user id from wfd_app""