Merge "Fixed a few bugs in NUI Main Activity." am: a39e732c63
am: ae6cfe3c50

Change-Id: I311f1fd49f78ee73ca17822f5cae4a6eab037f92