Merge "Only notify listeners if device Id changed"