Merge "Add unit tests for activity client state changes" into qt-dev