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

Change-Id: I40702850eeeaa137b8a60a40022be191081e4a0e