Merge "Don't touch the VFS during window relayout." into gingerbread