Merge "Quick fix for notification scrim showing when swiping up the bouncer" into tm-dev