Merge "When quickstep resets, set the nav bar alpha back to 1f"