Merge "[DO NOT MERGE] Address the Smartspace UI templates APIs review comments." into tm-dev