Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev