Made room message notification preference display case consistent
Merge branch 'master' into gmail