Merge "Increase max dequeue buffer count only for non-secure decoders" into qt-qpr1-dev am: b34e4ac722
am: a649df43ea

Change-Id: I875e6ec2b04e1a9191969effedc41a5202c84e58