Merge "Wire-up new flexiglass bouncer to work with existing keyguard codde" into main