Merge "Use correct context, resources and configuration in bouncer + keyboard packages" into main