Merge "Introduced ActivityServiceConnectionsHolder (18/n)"