Merge "Add support for post-decode density scaling with reuse"