Merge "Fix use of fitsSystemWindows, so padding doesn't conflict."