Merge "Make sure udfps bouncer always shows when requested" into sc-dev