Merge "Non-animated checkbox"