Merge "before shipping, remove stacktrace printing in requery-warning msg"