Merge "Fix nobootanimation toggle"