Merge "Refinements for app transitions" into mnc-dev