Merge "Fix Android Lint" into main