Merge "Fix screenlayout calculation with overridden screenW/Hdp"