Merge "Fixed a few bugs in NUI Main Activity."