Merge "Add feature for helping apps track how they've been launched" into mnc-ub-dev