Merge "Remove trailing spaces from Handler.java" into main