Merge "Fix intent tile to unlock on launching activities" into mnc-dev