Merge "Fixing layouting issues with NonClientDecorView"