Merge "block: allow init.rc to tune max discard size" into qt-qpr1-dev