Merge "Focus the SaveUi-Yes-Button by default" into oc-dev am: 5bfeece239
am: 52d9ce9921

Change-Id: I2c1236313d50378c87cadb488af92093054fd56d