Merge "Move main function out of namespace" into qt-dev am: 5927a9b1f1 am: 14a53832d4
am: d9a7c25e7a

Change-Id: I30b92416e5c1037b299f9da238ee2e8fc4dd4183