Merge "Moving Server dependencies to frameworks/libs" into main