Merge "Fix broken documentation in Activity.java" into main