Merge "Fixed NPE during boot animation on fugu." into nyc-dev