Merge "[error-reporting] ReviewDialog preference link grabs vertical space"