We should sync up our settings for line wraps so these don't keep going back and forth. My preference would be always 8 spaces (this is also consistent with AOSP).