Merge "TAPL: Verifying activity start/stop events" into ub-launcher3-master