Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into pi-dev