"Merge remote-tracking branch 'ui_dev' into HEAD"

Change-Id: I69525bbec62d4c159f2f9569c26f68a27959e163