Merge "Hit back button in overflow to collapse stack" into rvc-dev am: 17d4f35326

Change-Id: I818dc8a6f9479610dc3398f0aeb7735d87ffc347