Merge "Merge "DO NOT MERGE: Fix the correct front stack id in all modes" into oreo-cts-dev am: 5b2e8c0195  -s ours"