Merge "[Panlingual][patch] Settings UI revamp - Navigation handling"