Merge "Implement new BS warning / notification flow (2/2)" into pi-dev