Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev