Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev