[2/2] Sync up with Madhi base

Finishing sync up with Mahdi base - _packages_apps_Settings