Merge "Hit back button in overflow to collapse stack" into rvc-dev