Merge "SvidUsed mask in position report fix"