Merge "Create aconfig flag for relocating Smartspace to bottom." into main