Merge "Remove suggestion span underline on device rotation"