Merge "Add minimum show time for the udfps bouncer." into sc-qpr1-dev