Merge "Fixed wrong QS padding" into rvc-dev am: 841f253cb1

Change-Id: I0cb429b856c08450e2342d0b3e61ac630073cd00