Merge "Add kotlin-annotations to WindowManager-Shell"