Merge "Fix SmartspaceService callback comparison." into tm-qpr-dev