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

Change-Id: Ifdc60411119376ec5aa6c9da4db86eae143588a3