Merge "Minor tweak in getLocationInWindow"