Merge "Fix janky browse transition" into mnc-dev