Merge "Disable density scaling for HW canvas" into mnc-dev