Merge "Fix ClientMode initialization order" into qt-dev
am: 5571ad3446

Change-Id: I385c670e33dd3d57c635986c5daa06d57d96d2a6