Merge "Do not show UI when currentID changed." into oc-dev
am: ff5eb06e3d

Change-Id: I024dc7344a2c6074f50e06aef6bfb95664d13495