Merge "Fix screenlayout calculation with overridden screenW/Hdp" into rvc-qpr-dev