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

Change-Id: I74072c0bf49dec65821453786edc797b8c5d5065