Merge "Addressing a bug in parcelization of SmartspaceAction's bundle." into sc-dev