Merge "Annotate test method visibility in WindowManager" into oc-dev