Fixed where branded applications save their settings

Now settings are saved to a directory with the branded application
name.

Change-Id: I2a9f99d47d43e2567588eab0b1bac71cac64a9b7
Merge topic 'settings_custom_apps' into next

fbc98680 Fixed where branded applications save their settings