Merge "Update agl-service-windowmanager-2017"