Merge "Add unit tests for activity client state changes" into qt-dev
am: 153f73cbcc

Change-Id: I8d843d99025dac74f13d83224eacfdeca682a69c