Merge "Added unit test for activity start interceptor" into pi-dev