Merge UI fixes in metro back to master