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

Change-Id: Ia7fcd5d1e4f879eeb39c768aca7776a66be1704c