Merge "Do not use warning or limit to display "X B left" above usage bar" into pi-dev