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

Change-Id: I04f7fdb0130e7e4f121f8990afe9ab0988db43f7