Merge "WM: Fix broken layout hint calculation"