Rahul Yadav

@nitish1211 Can you resolve merge conflicts?

@timabbott I can do it too if you agree.

@saketkumar95 Thanks for your concern. Waiting for @timabbott reiview. :)

@timabbott OK :)

Actually `Topic`'s `AutoCompleteTextView` already has this property([`android:maxLines="1"`](https://github.com/yadav-rahul/zulip-android/blob/b857e7d022c818841f87989f374413cb4a9c987d/app/src/main/res/layout/chatbox.xml#L34)). Implementing same in `Stream`'s `AutoCompleteTextView` would look better :) @kunall17 What are your views on it?

@timabbott @kunall17 Please review this PR :)

@minervapanda Due to recent merges in `master`, merge conflicts have been created. Please try to resolve them.

@pkarira I am on it.

@pkarira Thanks for pointing this out. I am on it.