Merge "Add custom title for settings dialogs" into qt-dev
am: f4fc729acd

Change-Id: Ie45507265161fd7e360c9b0e366dff52c7a19300