Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into oc-dev am: 70ffc41cad am: 063d83ca63

Change-Id: I0622df10fdde4fb961c920fc0c9529e4c3b3ecfc