Merge "Fix janky navbar ripples -- incorrect timerslack values" into mnc-dev