Merge "[for-RC2] Urgent - uprev agl-service-windowmanager SRCREV"