Merge "Add flag for smartspace as a widget implementation" into main