Merge "Add flags for updating Smartspace UI." into main