Merge changes from topic "am-f499141b8349495698cacd314a5af297"
* changes:
[automerger skipped] Merge "Update surface related api in ShortcutIno for readability." into tm-dev am: 93ab8fc5 -s ours
[automerger skipped] Update surface related api in ShortcutIno for readability. am: b5f6bfef -s ours