Apply changes from code review
Apply changes from code review

Signed-off-by: Mustafa Kara <dc29e17de0b226335b89d5a058b4ad2b37eb8e78@mattermost.com>

mattermost/mattermost-mobile,mattermost/mattermost-mobile,mattermost/mattermost-mobile,mattermost/mattermost-mobile,mattermost/mattermost-mobile,mattermost/mattermost-mobile,mattermost/mattermost-mobile,mattermost/mattermost-mobile,mattermost/mattermost-mobile,mattermost/mattermost-mobile