Modify settings view to use language property (cherry picked from commit 83525c8)
Modify settings view to use language property
(cherry picked from commit 83525c8)

TSaaP/tsaap-notes,elaastic/elaastic-questions,elaastic/elaastic-questions,elaastic/elaastic-questions,TSaaP/tsaap-notes